From: Samuel Bronson <naesten@gmail.com>
Date: Fri, 30 Nov 2012 07:37:23 +0000 (+0800)
Subject: * progmodes/grep.el (grep-compute-defaults): Do not pass the -e flag to xargs
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~9^2~124
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6fccd6e8b536a2e0d243a2aba31c34d7a422402b;p=emacs.git

* progmodes/grep.el (grep-compute-defaults): Do not pass the -e flag to xargs
for compatibility with BSD xargs.

Fixes: debbugs:11703
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eef59e75ac8..d2f0824e15e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-30  Samuel Bronson  <naesten@gmail.com>
+
+	* progmodes/grep.el (grep-compute-defaults): Do not pass the -e
+	flag to xargs, for compatibility with BSD xargs (Bug#11703).
+
 2012-11-30  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
 
 	* textmodes/fill.el (fill-region-as-paragraph): Handle overshoot
@@ -11610,7 +11615,7 @@
 	* dynamic-setting.el (font-setting-change-default-font): Don't
 	change the default face if SET-FONT argument is non-nil (Bug#9982).
 
-2012-01-29  Samuel Bronson  <naesten@gmail.com>  (tiny change)
+2012-01-29  Samuel Bronson  <naesten@gmail.com>
 
 	* custom.el (defcustom): Add doc link to Lisp manual (Bug#10635).
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index c056b0f4e26..b448b7b3032 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -586,7 +586,7 @@ This function is called from `compilation-filter-hook'."
 		  'exec-plus)
 		 ((and
 		   (grep-probe find-program `(nil nil nil ,null-device "-print0"))
-		   (grep-probe xargs-program `(nil nil nil "-0" "-e" "echo")))
+		   (grep-probe xargs-program `(nil nil nil "-0" "echo")))
 		  'gnu)
 		 (t
 		  'exec))))
@@ -596,7 +596,7 @@ This function is called from `compilation-filter-hook'."
 		       ;; Windows shells need the program file name
 		       ;; after the pipe symbol be quoted if they use
 		       ;; forward slashes as directory separators.
-		       (format "%s . -type f -print0 | \"%s\" -0 -e %s"
+		       (format "%s . -type f -print0 | \"%s\" -0 %s"
 			       find-program xargs-program grep-command))
 		      ((memq grep-find-use-xargs '(exec exec-plus))
 		       (let ((cmd0 (format "%s . -type f -exec %s"
@@ -621,7 +621,7 @@ This function is called from `compilation-filter-hook'."
 				(format "%s " null-device)
 			      "")))
 		  (cond ((eq grep-find-use-xargs 'gnu)
-			 (format "%s . <X> -type f <F> -print0 | \"%s\" -0 -e %s"
+			 (format "%s . <X> -type f <F> -print0 | \"%s\" -0 %s"
 				 find-program xargs-program gcmd))
 			((eq grep-find-use-xargs 'exec)
 			 (format "%s . <X> -type f <F> -exec %s {} %s%s"